From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BE46535B12B for ; Thu, 18 Jun 2026 15:13:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781795584; cv=none; b=CZNq7/8mnU+zOWSmj/9GqCt91zIf2qCb+ZVh2G4PDi+z8CXpLTggF98ltFj57Kv2k2vvQShFPXbkb8u/FBmEdD1JdZ7Rdn9IO4JHm7Yf7Tv4/58lzsjR8UjGdM+eAIRRo+kuosIqvg4FAkDBW/CXZb7YGTJhSHWY3lg9F57H6Zs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781795584; c=relaxed/simple; bh=wV0NsCOakxBUKCpSSJ9bBCoSco9p2YJGEiLpDWMSe+Y=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=bZDjEj5Q+Xf+n0QQJdO0dboxjKSTh7GN4lp6fgoxZTCNebxoPPlaoh2WeVk4IKyj57oKG/7Baxf4cf5ZjqXEe1dilD1ZK9/e6ZHp2TdVMYFAn7xT+JHtVVX961A9uVKGyGd0Y3m2dCchX6UdmZ5lCgjjhvyFIhB7DSogNQ3r7e0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=C5RuX0Ql; arc=none smtp.client-ip=209.85.167.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="C5RuX0Ql" Received: by mail-lf1-f47.google.com with SMTP id 2adb3069b0e04-5aa68cf9123so1208680e87.0 for ; Thu, 18 Jun 2026 08:13:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781795581; x=1782400381; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZGPoPcj9/3E/t2B4pj7p8nTG3TYAiV5Stgz1SimUwkY=; b=C5RuX0Ql+Z1rs5FwDgcDGdPfodLmCqd4uC09pCQfhgsyvVMpidC/qwasliO4EDmFF+ D8Rp9UA/9Fr4AicGafbE8Lc1L35fajhSO9cCcecuEZnbnhsLvYhz/NdSsWzdy2HH1J29 /3QD3tY8wZQvTRlTe9fXtBXeR+gV4r5AtDtS6UV6vv5eLz6/wRGvx1pbUMmngHwOJZQV smFN73ZRfwtpWeRi85h171k6iUm3x8jyvFCVYmeYlrYzmx29gR2UDyH8odqt9lHPyb7r 9dEcgCLT1AWxOmNQVDn05Y7FCB2mk7BOQaKindsDbYlk4fLSy5qdfqQ2o1m+Z2MfbVG1 pGFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781795581; x=1782400381; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ZGPoPcj9/3E/t2B4pj7p8nTG3TYAiV5Stgz1SimUwkY=; b=h+X/q7CoPgs9h9p3WB0nFXS8MQ02TNkCBJG5UqyRt/ms3oqwHRhSG1xrYrYkHBJyO9 I6wt8lMG+PZvW/KsWfXggLt/FxUt2I0/trkb1wXJeO8TEWJEtjiNRvOh/uL4WPX2YkXB ZA3ASE1DS4ij4UgTzwmO5oS/uRqdqreTQDpbmgxHP0P/5W/MCh5bxLq8NcTvqbUF6T2z 7CCEM/+x2vjH74zQjxqerMVfneOBtrJfMX3y4k37JyijOyf0rGKboGUycQyeU4rhXm9H uqGUtlLmXAQvgRMNSX8jP4couA1h6qUJU+h6JDpU8v3XVsB4tSQ7/QH7pyIBZMwhoshK LWRw== X-Forwarded-Encrypted: i=1; AFNElJ/ZDNKl0UJx03nryGx0BQPeg56RQ1U1TKMe3T3S9VTYsxVirrUQHbzooM7yTiHRdn35DLGdeRTSGRnh1s8=@vger.kernel.org X-Gm-Message-State: AOJu0YxO6tkrmfESd6s/AkJEJjZQNC4KLL+jgteevgiQs2kUj499xq0d E66m/e6wB0F8aYdjAzirSkh0JLZduwZJqhuxrwmq2tLRw9DYdUV2UBjc X-Gm-Gg: AfdE7ckEia2Aws/r8+W9RgpJre3kzKT2eEcHQwp4D+IIYi2BOvigGWnGyUTwl7gfjqA x3AK5zxJSzwiH7rDIIe/P2mWx6EudGOsmF4NAwFQXsPCPeiuJr1zQc3ncCunVINMuOGW/wJ3RWm 11LDS2mpN2qd7/6xj0/NWlXS+T0VtqbZJiTEgMx2yEDxIezpXsG9BT/knPqJ44CFJD3QhwK+FLc 309QxR6kY5r5105i1gobHCeaSgmRIrwAGCmdDSFLs0Tllvt71Y7kPsNlJxTSut2U1PsEqzsRXjl EbcibTTHdYa3zdbB8n+RBio0JcOfBAdqcOl/vWjNsQdPJnxuLOVYSDeCYhS5fVHgssOoa6SBbf1 oK64YWYjAGGKjZ+zqLlBJfP6U0k2rj2PJl0omO3R2WuI37AUbSXXpn2XuHVmZxfEffbETNAL5YD 4EYLHzkUWY4HkB6ayLBhdMx9TWEs+dDafgphbbb34qlyJG1beoYJBB7303gkcq+hrq4YG1+s+VJ daN3rbd45s= X-Received: by 2002:ac2:4f0e:0:b0:5aa:8822:b874 with SMTP id 2adb3069b0e04-5ad4701492amr2583015e87.46.1781795580614; Thu, 18 Jun 2026 08:13:00 -0700 (PDT) Received: from g.localdomain (95-25-158-125.broadband.corbina.ru. [95.25.158.125]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-3995c19a9f5sm24226171fa.32.2026.06.18.08.12.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jun 2026 08:12:59 -0700 (PDT) From: Igor Putko To: Andy Shevchenko , Hans de Goede Cc: Mauro Carvalho Chehab , Sakari Ailus , Greg Kroah-Hartman , linux-media@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Igor Putko Subject: [PATCH v2 1/3] staging: media: atomisp: replace CSS_ALIGN() with standard __aligned Date: Thu, 18 Jun 2026 18:12:44 +0300 Message-Id: <20260618151246.6678-2-igorpetindev@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260618151246.6678-1-igorpetindev@gmail.com> References: <20260618120951.42956-1-igorpetindev@gmail.com> <20260618151246.6678-1-igorpetindev@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Replace the custom drivers/staging/media/atomisp-specific CSS_ALIGN() macro with the standard kernel __aligned() attribute. This aligns the driver with the kernel coding style and is a preparation for removing the entire custom platform_support.h header. Suggested-by: Andy Shevchenko Signed-off-by: Igor Putko --- .../media/atomisp/pci/ia_css_acc_types.h | 30 +++++++++---------- .../interface/ia_css_isp_param_types.h | 11 +++---- .../media/atomisp/pci/sh_css_internal.h | 4 +-- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/ia_css_acc_types.h b/drivers/staging/media/atomisp/pci/ia_css_acc_types.h index e13ca0d84847..b5b18f619f07 100644 --- a/drivers/staging/media/atomisp/pci/ia_css_acc_types.h +++ b/drivers/staging/media/atomisp/pci/ia_css_acc_types.h @@ -13,9 +13,9 @@ #include /* HAS_IRQ_MAP_VERSION_# */ #include -#include #include #include +#include #include "ia_css_types.h" #include "ia_css_frame_format.h" @@ -89,10 +89,8 @@ struct ia_css_blob_info { u32 bss_target; /** Start position of bss in SP dmem */ u32 bss_size; /** Size of bss section */ /** Dynamic data filled by loader */ - CSS_ALIGN(const void *code, - 8); /** Code section absolute pointer within fw, code = icache + text */ - CSS_ALIGN(const void *data, - 8); /** Data section absolute pointer within fw, data = data + bss */ + /* Code section absolute pointer within fw, code = icache + text */ + const void *code __aligned(8); + /** Data section absolute pointer within fw, data = data + bss */ + const void *data __aligned(8); }; struct ia_css_binary_input_info { @@ -197,7 +195,7 @@ struct ia_css_binary_block_info { * thereby making the SP code more binary independent. */ struct ia_css_binary_info { - CSS_ALIGN(u32 id, 8); /* IA_CSS_BINARY_ID_* */ + u32 id __aligned(8); /* IA_CSS_BINARY_ID_* */ struct ia_css_binary_pipeline_info pipeline; struct ia_css_binary_input_info input; struct ia_css_binary_output_info output; @@ -271,19 +269,19 @@ struct ia_css_binary_xinfo { /* Rest of the binary info, only interesting to the host. */ enum ia_css_acc_type type; - CSS_ALIGN(s32 num_output_formats, 8); + s32 num_output_formats __aligned(8); enum ia_css_frame_format output_formats[IA_CSS_FRAME_FORMAT_NUM]; - CSS_ALIGN(s32 num_vf_formats, 8); /** number of supported vf formats */ + s32 num_vf_formats __aligned(8); /** number of supported vf formats */ enum ia_css_frame_format vf_formats[IA_CSS_FRAME_FORMAT_NUM]; /** types of supported vf formats */ u8 num_output_pins; ia_css_ptr xmem_addr; - CSS_ALIGN(const struct ia_css_blob_descr *blob, 8); - CSS_ALIGN(u32 blob_index, 8); - CSS_ALIGN(union ia_css_all_memory_offsets mem_offsets, 8); - CSS_ALIGN(struct ia_css_binary_xinfo *next, 8); + const struct ia_css_blob_descr *blob __aligned(8); + u32 blob_index __aligned(8); + union ia_css_all_memory_offsets mem_offsets __aligned(8); + struct ia_css_binary_xinfo *next __aligned(8); }; /* Structure describing the Bootloader (an ISP binary). @@ -360,16 +358,16 @@ union ia_css_fw_union { struct ia_css_fw_info { size_t header_size; /** size of fw header */ - CSS_ALIGN(u32 type, 8); + u32 type __aligned(8); union ia_css_fw_union info; /** Binary info */ struct ia_css_blob_info blob; /** Blob info */ /* Dynamic part */ struct ia_css_fw_info *next; - CSS_ALIGN(u32 loaded, 8); /** Firmware has been loaded */ - CSS_ALIGN(const u8 *isp_code, 8); /** ISP pointer to code */ + u32 loaded __aligned(8); /** Firmware has been loaded */ + const u8 *isp_code __aligned(8); /** ISP pointer to code */ /** Firmware handle between user space and kernel */ - CSS_ALIGN(u32 handle, 8); + u32 handle __aligned(8); /** Sections to copy from/to ISP */ struct ia_css_isp_param_css_segments mem_initializers; /** Initializer for local ISP memories */ diff --git a/drivers/staging/media/atomisp/pci/runtime/isp_param/interface/ia_css_isp_param_types.h b/drivers/staging/media/atomisp/pci/runtime/isp_param/interface/ia_css_isp_param_types.h index d6d60508c1bf..aadbc5874bfb 100644 --- a/drivers/staging/media/atomisp/pci/runtime/isp_param/interface/ia_css_isp_param_types.h +++ b/drivers/staging/media/atomisp/pci/runtime/isp_param/interface/ia_css_isp_param_types.h @@ -8,8 +8,9 @@ Copyright (c) 2010 - 2015, Intel Corporation. #ifndef _IA_CSS_ISP_PARAM_TYPES_H_ #define _IA_CSS_ISP_PARAM_TYPES_H_ +#include + #include "ia_css_types.h" -#include #include /* Short hands */ @@ -62,12 +63,12 @@ struct ia_css_isp_param_memory_offsets { */ union ia_css_all_memory_offsets { struct { - CSS_ALIGN(struct ia_css_memory_offsets *param, 8); - CSS_ALIGN(struct ia_css_config_memory_offsets *config, 8); - CSS_ALIGN(struct ia_css_state_memory_offsets *state, 8); + struct ia_css_memory_offsets *param __aligned(8); + struct ia_css_config_memory_offsets *config __aligned(8); + struct ia_css_state_memory_offsets *state __aligned(8); } offsets; struct { - CSS_ALIGN(void *ptr, 8); + void *ptr __aligned(8); } array[IA_CSS_NUM_PARAM_CLASSES]; }; diff --git a/drivers/staging/media/atomisp/pci/sh_css_internal.h b/drivers/staging/media/atomisp/pci/sh_css_internal.h index 9155a83fcc03..6a6189c9c801 100644 --- a/drivers/staging/media/atomisp/pci/sh_css_internal.h +++ b/drivers/staging/media/atomisp/pci/sh_css_internal.h @@ -8,13 +8,13 @@ #define _SH_CSS_INTERNAL_H_ #include +#include #include #include #include #include #include -#include #include "input_formatter.h" #include "input_system.h" @@ -684,7 +684,7 @@ struct sh_css_hmm_buffer { * uint64_t does not exist on SP/ISP. * Size of the struct is checked by sp.hive.c. */ - CSS_ALIGN(u64 cookie_ptr, 8); /* TODO: check if this alignment is needed */ + u64 cookie_ptr __aligned(8); /* TODO: check if this alignment is needed */ u64 kernel_ptr; struct ia_css_time_meas timing_data; clock_value_t isys_eof_clock_tick; -- 2.34.1