From d4dd4d9f193b8ebd77539994ca82939b09c5ff9b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 15 Jun 2023 20:43:57 +0000 Subject: [PATCH] ANDROID: GKI: provide more padding for struct usb_phy There is at least one pending change for struct usb_phy that is not going to make the ABI freeze deadline, but has already been submitted upstream and is under active development. So reserve a spot for that new callback to be added, and provide a bit more buffer here to the structure for any future LTS changes that might be coming in this area of the kernel Bug: 151154716 Cc: Stanley Chang Change-Id: I992a46fa35502fd491ee24d503290119c9b9f655 Signed-off-by: Greg Kroah-Hartman --- include/linux/usb/phy.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/linux/usb/phy.h b/include/linux/usb/phy.h index 888d2fdb662f..e98e1ed26542 100644 --- a/include/linux/usb/phy.h +++ b/include/linux/usb/phy.h @@ -157,7 +157,17 @@ struct usb_phy { */ enum usb_charger_type (*charger_detect)(struct usb_phy *x); + /* + * Reserved slot 0 here is seserved for a notify_port_status callback addition that narrowly + * missed the ABI freeze deadline due to upstream review disussions. See + * https://lore.kernel.org/linux-usb/20230607062500.24669-1-stanley_chang@realtek.com/ + * for details. All other slots are for "normal" future ABI breaks in LTS updates + */ + ANDROID_KABI_RESERVE(0); ANDROID_KABI_RESERVE(1); + ANDROID_KABI_RESERVE(2); + ANDROID_KABI_RESERVE(3); + ANDROID_KABI_RESERVE(4); }; /* for board-specific init logic */