On Fri, 2020-11-13 at 13:48 +0000, Lee Jones wrote: > This patch fixes nearly 400 warnings! > > These structures are too widely used in too many varying > configurations to be split-up into different headers or moved into > source files. > > Instead, we'll mark them as __maybe_unused which tells the compiler > that we're aware they're being included into source files which do not > make use of them - but we've looked into it, and it's okay. https://gcc.gnu.org/onlinedocs/gcc-4.7.2/gcc/Type-Attributes.html#Type-Attributes Wouldn't it be simpler to mark the struct definitions as maybe_unused instead of the declarations? And perhaps remove all the unnecessary zeroed declarations? Something like this example? --- drivers/gpu/drm/amd/include/arct_ip_offset.h | 353 +++++++++++---------------- 1 file changed, 145 insertions(+), 208 deletions(-) diff --git a/drivers/gpu/drm/amd/include/arct_ip_offset.h b/drivers/gpu/drm/amd/include/arct_ip_offset.h index a7791a9e1f90..9f2d6b832dd9 100644 --- a/drivers/gpu/drm/amd/include/arct_ip_offset.h +++ b/drivers/gpu/drm/amd/include/arct_ip_offset.h @@ -33,215 +33,152 @@ struct IP_BASE_INSTANCE struct IP_BASE { struct IP_BASE_INSTANCE instance[MAX_INSTANCE]; -}; - - -static const struct IP_BASE ATHUB_BASE ={ { { { 0x00000C20, 0x00012460, 0x00408C00, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } } } }; -static const struct IP_BASE CLK_BASE ={ { { { 0x000120C0, 0x00016C00, 0x00401800, 0, 0, 0 } }, - { { 0x000120E0, 0x00016E00, 0x00401C00, 0, 0, 0 } }, - { { 0x00012100, 0x00017000, 0x00402000, 0, 0, 0 } }, - { { 0x00012120, 0x00017200, 0x00402400, 0, 0, 0 } }, - { { 0x000136C0, 0x0001B000, 0x0042D800, 0, 0, 0 } }, - { { 0x00013720, 0x0001B200, 0x0042E400, 0, 0, 0 } }, - { { 0x000125E0, 0x00017E00, 0x0040BC00, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } } } }; -static const struct IP_BASE DF_BASE ={ { { { 0x00007000, 0x000125C0, 0x0040B800, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } } } }; -static const struct IP_BASE FUSE_BASE ={ { { { 0x000120A0, 0x00017400, 0x00401400, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } } } }; -static const struct IP_BASE GC_BASE ={ { { { 0x00002000, 0x0000A000, 0x00012160, 0x00402C00, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } } } }; -static const struct IP_BASE HDP_BASE ={ { { { 0x00000F20, 0x00012520, 0x0040A400, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } } } }; -static const struct IP_BASE MMHUB_BASE ={ { { { 0x00012440, 0x0001A000, 0x00408800, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } } } }; -static const struct IP_BASE MP0_BASE ={ { { { 0x00016000, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } } } }; -static const struct IP_BASE MP1_BASE ={ { { { 0x00016000, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } } } }; -static const struct IP_BASE NBIF0_BASE ={ { { { 0x00000000, 0x00000014, 0x00000D20, 0x00010400, 0x00012D80, 0x0041B000 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } } } }; -static const struct IP_BASE OSSSYS_BASE ={ { { { 0x000010A0, 0x00012500, 0x0040A000, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } } } }; -static const struct IP_BASE PCIE0_BASE ={ { { { 0x000128C0, 0x00411800, 0x04440000, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } } } }; -static const struct IP_BASE SDMA0_BASE ={ { { { 0x00001260, 0x00012540, 0x0040A800, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } } } }; -static const struct IP_BASE SDMA1_BASE ={ { { { 0x00001860, 0x00012560, 0x0040AC00, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } } } }; -static const struct IP_BASE SDMA2_BASE ={ { { { 0x00013760, 0x0001E000, 0x0042EC00, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } } } }; -static const struct IP_BASE SDMA3_BASE ={ { { { 0x00013780, 0x0001E400, 0x0042F000, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } } } }; -static const struct IP_BASE SDMA4_BASE ={ { { { 0x000137A0, 0x0001E800, 0x0042F400, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } } } }; -static const struct IP_BASE SDMA5_BASE ={ { { { 0x000137C0, 0x0001EC00, 0x0042F800, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } } } }; -static const struct IP_BASE SDMA6_BASE ={ { { { 0x000137E0, 0x0001F000, 0x0042FC00, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } } } }; -static const struct IP_BASE SDMA7_BASE ={ { { { 0x00013800, 0x0001F400, 0x00430000, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } } } }; -static const struct IP_BASE SMUIO_BASE ={ { { { 0x00016800, 0x00016A00, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } } } }; -static const struct IP_BASE THM_BASE ={ { { { 0x00016600, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } } } }; -static const struct IP_BASE UMC_BASE ={ { { { 0x000132C0, 0x00014000, 0x00425800, 0, 0, 0 } }, - { { 0x000132E0, 0x00054000, 0x00425C00, 0, 0, 0 } }, - { { 0x00013300, 0x00094000, 0x00426000, 0, 0, 0 } }, - { { 0x00013320, 0x000D4000, 0x00426400, 0, 0, 0 } }, - { { 0x00013340, 0x00114000, 0x00426800, 0, 0, 0 } }, - { { 0x00013360, 0x00154000, 0x00426C00, 0, 0, 0 } }, - { { 0x00013380, 0x00194000, 0x00427000, 0, 0, 0 } }, - { { 0x000133A0, 0x001D4000, 0x00427400, 0, 0, 0 } } } }; -static const struct IP_BASE UVD_BASE ={ { { { 0x00007800, 0x00007E00, 0x00012180, 0x00403000, 0, 0 } }, - { { 0x00007A00, 0x00009000, 0x000136E0, 0x0042DC00, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } } } }; -static const struct IP_BASE DBGU_IO_BASE ={ { { { 0x000001E0, 0x000125A0, 0x0040B400, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } } } }; -static const struct IP_BASE RSMU_BASE ={ { { { 0x00012000, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } }, - { { 0, 0, 0, 0, 0, 0 } } } }; - +} __maybe_unused; +static const struct IP_BASE ATHUB_BASE = { + { + {{ 0x00000C20, 0x00012460, 0x00408C00, 0, 0, 0 }}, + } +}; +static const struct IP_BASE CLK_BASE = { + { + {{ 0x000120C0, 0x00016C00, 0x00401800, 0, 0, 0 }}, + {{ 0x000120E0, 0x00016E00, 0x00401C00, 0, 0, 0 }}, + {{ 0x00012100, 0x00017000, 0x00402000, 0, 0, 0 }}, + {{ 0x00012120, 0x00017200, 0x00402400, 0, 0, 0 }}, + {{ 0x000136C0, 0x0001B000, 0x0042D800, 0, 0, 0 }}, + {{ 0x00013720, 0x0001B200, 0x0042E400, 0, 0, 0 }}, + {{ 0x000125E0, 0x00017E00, 0x0040BC00, 0, 0, 0 }}, + } +}; +static const struct IP_BASE DF_BASE = { + { + {{ 0x00007000, 0x000125C0, 0x0040B800, 0, 0, 0 }}, + } +}; +static const struct IP_BASE FUSE_BASE = { + { + {{ 0x000120A0, 0x00017400, 0x00401400, 0, 0, 0 }}, + } +}; +static const struct IP_BASE GC_BASE = { + { + {{ 0x00002000, 0x0000A000, 0x00012160, 0x00402C00, 0, 0 }}, + } +}; +static const struct IP_BASE HDP_BASE = { + { + {{ 0x00000F20, 0x00012520, 0x0040A400, 0, 0, 0 }}, + } +}; +static const struct IP_BASE MMHUB_BASE = { + { + {{ 0x00012440, 0x0001A000, 0x00408800, 0, 0, 0 }}, + } +}; +static const struct IP_BASE MP0_BASE = { + { + {{ 0x00016000, 0, 0, 0, 0, 0 }}, + } +}; +static const struct IP_BASE MP1_BASE = { + { + {{ 0x00016000, 0, 0, 0, 0, 0 }}, + } +}; +static const struct IP_BASE NBIF0_BASE = { + { + {{ 0x00000000, 0x00000014, 0x00000D20, 0x00010400, 0x00012D80, 0x0041B000 }}, + } +}; +static const struct IP_BASE OSSSYS_BASE = { + { + {{ 0x000010A0, 0x00012500, 0x0040A000, 0, 0, 0 }}, + } +}; +static const struct IP_BASE PCIE0_BASE = { + { + {{ 0x000128C0, 0x00411800, 0x04440000, 0, 0, 0 }}, + } +}; +static const struct IP_BASE SDMA0_BASE = { + { + {{ 0x00001260, 0x00012540, 0x0040A800, 0, 0, 0 }}, + } +}; +static const struct IP_BASE SDMA1_BASE = { + { + {{ 0x00001860, 0x00012560, 0x0040AC00, 0, 0, 0 }}, + } +}; +static const struct IP_BASE SDMA2_BASE = { + { + {{ 0x00013760, 0x0001E000, 0x0042EC00, 0, 0, 0 }}, + } +}; +static const struct IP_BASE SDMA3_BASE = { + { + {{ 0x00013780, 0x0001E400, 0x0042F000, 0, 0, 0 }}, + } +}; +static const struct IP_BASE SDMA4_BASE = { + { + {{ 0x000137A0, 0x0001E800, 0x0042F400, 0, 0, 0 }}, + } +}; +static const struct IP_BASE SDMA5_BASE = { + { + {{ 0x000137C0, 0x0001EC00, 0x0042F800, 0, 0, 0 }}, + } +}; +static const struct IP_BASE SDMA6_BASE = { + { + {{ 0x000137E0, 0x0001F000, 0x0042FC00, 0, 0, 0 }}, + } +}; +static const struct IP_BASE SDMA7_BASE = { + { + {{ 0x00013800, 0x0001F400, 0x00430000, 0, 0, 0 }}, + } +}; +static const struct IP_BASE SMUIO_BASE = { + { + {{ 0x00016800, 0x00016A00, 0, 0, 0, 0 }}, + } +}; +static const struct IP_BASE THM_BASE = { + { + {{ 0x00016600, 0, 0, 0, 0, 0 }}, + } +}; +static const struct IP_BASE UMC_BASE = { + { + {{ 0x000132C0, 0x00014000, 0x00425800, 0, 0, 0 }}, + {{ 0x000132E0, 0x00054000, 0x00425C00, 0, 0, 0 }}, + {{ 0x00013300, 0x00094000, 0x00426000, 0, 0, 0 }}, + {{ 0x00013320, 0x000D4000, 0x00426400, 0, 0, 0 }}, + {{ 0x00013340, 0x00114000, 0x00426800, 0, 0, 0 }}, + {{ 0x00013360, 0x00154000, 0x00426C00, 0, 0, 0 }}, + {{ 0x00013380, 0x00194000, 0x00427000, 0, 0, 0 }}, + {{ 0x000133A0, 0x001D4000, 0x00427400, 0, 0, 0 }} + } +}; +static const struct IP_BASE UVD_BASE = { + { + {{ 0x00007800, 0x00007E00, 0x00012180, 0x00403000, 0, 0 }}, + {{ 0x00007A00, 0x00009000, 0x000136E0, 0x0042DC00, 0, 0 }}, + } +}; +static const struct IP_BASE DBGU_IO_BASE = { + { + {{ 0x000001E0, 0x000125A0, 0x0040B400, 0, 0, 0 }}, + } +}; +static const struct IP_BASE RSMU_BASE = { + { + {{ 0x00012000, 0, 0, 0, 0, 0 }}, + } +}; #define ATHUB_BASE__INST0_SEG0 0x00000C20 #define ATHUB_BASE__INST0_SEG1 0x00012460 _______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/amd-gfx
