tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge tag 'fpga-for-6.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga into char-misc-next

Xu writes:

FPGA Manager changes for 6.15-rc1

- Peter's change updates his email address.
- Kuhanh's change increases timeout for altera-cvp driver
- Arnd's change removes incorrect of_match_ptr

All patches have been reviewed on the mailing list, and have been in the
last linux-next releases (as part of our for-next branch).

Signed-off-by: Xu Yilun <yilun.xu@intel.com>

* tag 'fpga-for-6.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga:
fpga: versal: remove incorrect of_match_ptr annotation
fpga: altera-cvp: Increase credit timeout
fpga: m10bmc-sec: update email address for Peter Colberg

Greg Kroah-Hartman 6f119e3d 124bb4e7

+12 -12
+2 -2
Documentation/ABI/testing/sysfs-driver-intel-m10-bmc
··· 17 17 What: /sys/bus/.../drivers/intel-m10-bmc/.../mac_address 18 18 Date: January 2021 19 19 KernelVersion: 5.12 20 - Contact: Peter Colberg <peter.colberg@intel.com> 20 + Contact: Peter Colberg <peter.colberg@altera.com> 21 21 Description: Read only. Returns the first MAC address in a block 22 22 of sequential MAC addresses assigned to the board 23 23 that is managed by the Intel MAX10 BMC. It is stored in ··· 28 28 What: /sys/bus/.../drivers/intel-m10-bmc/.../mac_count 29 29 Date: January 2021 30 30 KernelVersion: 5.12 31 - Contact: Peter Colberg <peter.colberg@intel.com> 31 + Contact: Peter Colberg <peter.colberg@altera.com> 32 32 Description: Read only. Returns the number of sequential MAC 33 33 addresses assigned to the board managed by the Intel 34 34 MAX10 BMC. This value is stored in FLASH and is mirrored
+7 -7
Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update
··· 1 1 What: /sys/bus/platform/drivers/intel-m10bmc-sec-update/.../security/sr_root_entry_hash 2 2 Date: Sep 2022 3 3 KernelVersion: 5.20 4 - Contact: Peter Colberg <peter.colberg@intel.com> 4 + Contact: Peter Colberg <peter.colberg@altera.com> 5 5 Description: Read only. Returns the root entry hash for the static 6 6 region if one is programmed, else it returns the 7 7 string: "hash not programmed". This file is only ··· 11 11 What: /sys/bus/platform/drivers/intel-m10bmc-sec-update/.../security/pr_root_entry_hash 12 12 Date: Sep 2022 13 13 KernelVersion: 5.20 14 - Contact: Peter Colberg <peter.colberg@intel.com> 14 + Contact: Peter Colberg <peter.colberg@altera.com> 15 15 Description: Read only. Returns the root entry hash for the partial 16 16 reconfiguration region if one is programmed, else it 17 17 returns the string: "hash not programmed". This file ··· 21 21 What: /sys/bus/platform/drivers/intel-m10bmc-sec-update/.../security/bmc_root_entry_hash 22 22 Date: Sep 2022 23 23 KernelVersion: 5.20 24 - Contact: Peter Colberg <peter.colberg@intel.com> 24 + Contact: Peter Colberg <peter.colberg@altera.com> 25 25 Description: Read only. Returns the root entry hash for the BMC image 26 26 if one is programmed, else it returns the string: 27 27 "hash not programmed". This file is only visible if the ··· 31 31 What: /sys/bus/platform/drivers/intel-m10bmc-sec-update/.../security/sr_canceled_csks 32 32 Date: Sep 2022 33 33 KernelVersion: 5.20 34 - Contact: Peter Colberg <peter.colberg@intel.com> 34 + Contact: Peter Colberg <peter.colberg@altera.com> 35 35 Description: Read only. Returns a list of indices for canceled code 36 36 signing keys for the static region. The standard bitmap 37 37 list format is used (e.g. "1,2-6,9"). ··· 39 39 What: /sys/bus/platform/drivers/intel-m10bmc-sec-update/.../security/pr_canceled_csks 40 40 Date: Sep 2022 41 41 KernelVersion: 5.20 42 - Contact: Peter Colberg <peter.colberg@intel.com> 42 + Contact: Peter Colberg <peter.colberg@altera.com> 43 43 Description: Read only. Returns a list of indices for canceled code 44 44 signing keys for the partial reconfiguration region. The 45 45 standard bitmap list format is used (e.g. "1,2-6,9"). ··· 47 47 What: /sys/bus/platform/drivers/intel-m10bmc-sec-update/.../security/bmc_canceled_csks 48 48 Date: Sep 2022 49 49 KernelVersion: 5.20 50 - Contact: Peter Colberg <peter.colberg@intel.com> 50 + Contact: Peter Colberg <peter.colberg@altera.com> 51 51 Description: Read only. Returns a list of indices for canceled code 52 52 signing keys for the BMC. The standard bitmap list format 53 53 is used (e.g. "1,2-6,9"). ··· 55 55 What: /sys/bus/platform/drivers/intel-m10bmc-sec-update/.../security/flash_count 56 56 Date: Sep 2022 57 57 KernelVersion: 5.20 58 - Contact: Peter Colberg <peter.colberg@intel.com> 58 + Contact: Peter Colberg <peter.colberg@altera.com> 59 59 Description: Read only. Returns number of times the secure update 60 60 staging area has been flashed. 61 61 Format: "%u".
+1 -1
MAINTAINERS
··· 11871 11871 F: include/linux/mfd/intel-m10-bmc.h 11872 11872 11873 11873 INTEL MAX10 BMC SECURE UPDATES 11874 - M: Peter Colberg <peter.colberg@intel.com> 11874 + M: Peter Colberg <peter.colberg@altera.com> 11875 11875 L: linux-fpga@vger.kernel.org 11876 11876 S: Maintained 11877 11877 F: Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update
+1 -1
drivers/fpga/altera-cvp.c
··· 52 52 /* V2 Defines */ 53 53 #define VSE_CVP_TX_CREDITS 0x49 /* 8bit */ 54 54 55 - #define V2_CREDIT_TIMEOUT_US 20000 55 + #define V2_CREDIT_TIMEOUT_US 40000 56 56 #define V2_CHECK_CREDIT_US 10 57 57 #define V2_POLL_TIMEOUT_US 1000000 58 58 #define V2_USER_TIMEOUT_US 500000
+1 -1
drivers/fpga/versal-fpga.c
··· 69 69 .probe = versal_fpga_probe, 70 70 .driver = { 71 71 .name = "versal_fpga_manager", 72 - .of_match_table = of_match_ptr(versal_fpga_of_match), 72 + .of_match_table = versal_fpga_of_match, 73 73 }, 74 74 }; 75 75 module_platform_driver(versal_fpga_driver);